Delete leftover conflict markers.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index f849a96a66ebfa7c59dfdfbf20914cdf1dcd8398..6ea7ddebbfd74f5239d65ec86fd008aa2724a800 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -45,13 +45,11 @@
        * PROBLEMS:
        * MACHINES: Remove VMS info.
 
->>>>>>> 1.736
 2008-07-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * PROBLEMS:
        * MACHINES: Remove mentions of Mac Carbon.
 
->>>>>>> 1.727
 2008-07-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
        * NEWS: New function `diff-show-trailing-blanks' in diff-mode.el.